build fixes for check target

diff --git a/ChangeLog b/ChangeLog
index 8712a8dd08d83b365df5a099872f263981fe89da..3d755ec31638332322b703cd0c1356f633dd8356 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-09-08  Øyvind Kolås  <pippin@gimp.org>
 
+       * Makefile.am: build extensions before tests.
+       * extensions/Makefile.in: build extensions when check is done.
        * tests/Makefile.am: removed erroniously added foo test.
 
 2005-09-08  Øyvind Kolås  <pippin@gimp.org>

diff --git a/Makefile.am b/Makefile.am
index 9a86a35d5bf45de7a0fed0dabd23a8d4de971bd8..beb8374b1792ac1272b86e460a7f5a6d91da7e10 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 
-SUBDIRS = babl \
-         tests \
-         docs  \
-         extensions
+SUBDIRS = babl         \
+         extensions    \
+         tests         \
+         docs
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = babl.pc

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 054f163b56283ae20b6d697db24bc64d9e31f393..927c904f7ef553a283b9196b22de12baec48f6ec 100644 (file)
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -53,8 +53,8 @@ distdir:
        cp $(CFILES) $(Makefile.in) $$distdir
 
 dvi:
-check:
        #playing along with automake
+check: all
 
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b55612c25c38f86702bf5d1f815ec01558428957..51bfaf5a63217ef243f0d7469c3df13cc25d7631 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,6 @@ TESTS =                               \
        conversions             \
        types                   \
        models                  \
-       foo                     \
        babl_class_name
 
 TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions
@@ -25,7 +24,6 @@ babl_class_name_SOURCES     = babl_class_name.c
 sanity_SOURCES              = sanity.c
 types_SOURCES               = types.c
 models_SOURCES              = models.c
-foo_SOURCES                 = foo.c
 
 
 AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl